projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55a9c17
)
Avoid segfault when set-fontset-font is called from non-GUI frames
author
Eli Zaretskii
<eliz@gnu.org>
Fri, 30 Jul 2021 18:17:58 +0000
(21:17 +0300)
committer
Eli Zaretskii
<eliz@gnu.org>
Fri, 30 Jul 2021 18:17:58 +0000
(21:17 +0300)
* src/fontset.c (check_fontset_name): Avoid crashes if this is
called from a non-GUI frame. (Bug#49782)
src/fontset.c
patch
|
blob
|
history
diff --git
a/src/fontset.c
b/src/fontset.c
index 332be6c39d11f03afc8c7f5904a03fe1c8de9fee..52c7e381e15f7e0f340bb6f0c092d12aec0898ba 100644
(file)
--- a/
src/fontset.c
+++ b/
src/fontset.c
@@
-1356,6
+1356,9
@@
check_fontset_name (Lisp_Object name, Lisp_Object *frame)
int id;
struct frame *f = decode_live_frame (*frame);
+ if (!FRAME_WINDOW_P (f))
+ error ("Can't use fontsets in non-GUI frames");
+
XSETFRAME (*frame, f);
if (EQ (name, Qt))